d/rules: Don't export build results for tests that upstream expect to fail

diff --git a/debian/rules b/debian/rules
index 9ebe81891f8dbe1023c43804d305df727bd9a12b..1a602e970a32124c9d50ec23b94a6b7a98670e26 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -202,6 +202,11 @@ fuzzy_reftests = \
        quit-mnemonic \
        $(NULL)
 
+xfail_reftests = \
+       label-sizing \
+       sizegroups-evolution-identity-page \
+       $(NULL)
+
 # TODO: Known failures:
 # amd64: none
 # arm64: none
@@ -261,7 +266,15 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
                --timeout-multiplier $(test_timeout_multiplier) \
        || touch debian/tests-failed
        tail -v -n +0 debian/build/deb/meson-logs/testlog-x11.txt
+       # Don't base64-encode the image results for tests that upstream
+       # expect to fail
+       set -e; for reftest in $(xfail_reftests); do \
+               rm -f debian/build/deb/testsuite/reftests/output/x11/$$reftest.diff.png; \
+       done
+       # Put the rest in the log as base64 since we don't have an
+       # equivalent of AUTOPKGTEST_ARTIFACTS for buildds
        debian/log-reftests.py
+       # Avoid incremental builds with -nc leaking settings into the next build
        set -e; for reftest in $(fuzzy_reftests); do \
                rm -f testsuite/reftests/$$reftest.keyfile; \
        done